home *** CD-ROM | disk | FTP | other *** search
/ Usenet 1993 July / InfoMagic USENET CD-ROM July 1993.ISO / sources / x / volume2 / xtroff / patch3 next >
Encoding:
Internet Message Format  |  1988-11-14  |  38.3 KB
  1. Path: uunet!wyse!mikew
  2. From: mikew@wyse.wyse.com (Mike Wexler)
  3. Newsgroups: comp.sources.x
  4. Subject: v02i014:  a ditroff previewer for X, Patch3
  5. Message-ID: <1816@wyse.wyse.com>
  6. Date: 14 Nov 88 18:01:45 GMT
  7. Organization: Wyse Technology, San Jose
  8. Lines: 1136
  9. Approved: mikew@wyse.com
  10.  
  11. Submitted-by: Mark Moraes <moraes%csri.toronto.edu@RELAY.CS.NET>
  12. Posting-number: Volume 2, Issue 14
  13. Archive-name: xtroff/patch3
  14.  
  15. [I couldn't test this out since I don't have ditroff on the machine
  16. I use.  Good luck!]
  17.  
  18. The enclosed shar contains the changes needed to get xtroff (the ditroff
  19. previewer in contrib/clients in the X.V11R3 distribution) working
  20. under X.V11R3. (It was developed under R2, and should work with those
  21. libraries and includes).
  22.  
  23.  
  24.  
  25. #! /bin/sh
  26. # This is a shell archive.  Remove anything before this line, then unpack
  27. # it by saving it into a file and typing "sh file".  To overwrite existing
  28. # If this archive is complete, you will see the following message at the end:
  29. #        "End of shell archive."
  30. #
  31. # Contents:
  32. #   CHANGES.R3 update.sh ximakedo.sh
  33. #
  34. # Wrapped by xwindows@ai.utoronto.ca on Sat Nov 12 08:47:05 1988
  35. #
  36. PATH=/bin:/usr/bin:/usr/ucb ; export PATH
  37. if test -f CHANGES.R3 -a "${1}" != "-c" ; then 
  38.   echo shar: Will not over-write existing file \"CHANGES.R3\"
  39. else
  40. echo shar: Extracting \"CHANGES.R3\" \(6923 characters\)
  41. sed "s/^X//" >CHANGES.R3 <<'END_OF_CHANGES.R3'
  42. XThe shell scripts update.sh and ximakedo.sh will update xtroff (the ditroff
  43. Xpreviewer in contrib/clients in the R3 distribution) so that it sort of works
  44. Xunder R3.
  45. X
  46. XTo update, cd to wherever you have xtroff, and run update.sh. It cleans up a
  47. Xfew unnecessary files, and applies a set of patches - you need to have the
  48. XLarry Wall's patch program installed someplace. (See the util/patch
  49. Xdirectory in the core distribution)
  50. X
  51. XThen edit the ximake script to change the TOPDIR define to wherever the
  52. Xtoplevel of the core X11R3 distribution is - for us, that's
  53. X/h/xwindows/X.V11R3/core.src. Then run that script when you're in the 
  54. Xxtroff directory - it generates new Makefiles. (If you are familiar with
  55. Xximake, then you can probably run it by hand)
  56. X
  57. XYou can then type 'make'. Should work at least on Suns running SunOS3.5.
  58. X
  59. XCaveats:
  60. X    1. You must install the fonts before you try this out. You need to
  61. X    know where ditroff stores the device descriptions and where the 
  62. X    ditroff makedev program is.
  63. X
  64. X    2. The menus are still broken - they look weird. The key commands
  65. X    work, so I'm not even trying to fix the menus for a while. If someone
  66. X    who knows more about those menus can fix them, use different menus,
  67. X    (xterm, contrib/widgets/MenuBox, or the HP/Sony widgets, please do 
  68. X    so and let the rest of us know. Thanks.
  69. X
  70. X    3. The Minibuffer works, but you need to move the mouse down into it
  71. X    to type - I might sort that out once I figure out how grabs work
  72. X    now. Again, I'd welcome explanations/corrections.
  73. X
  74. X*****    3. I've had at least one server core dump just after running xtroff.
  75. X    It could be doing something that R3 Xsun doesn't like, or that
  76. X    triggers off a bug in R3 Xsun.
  77. X
  78. XNote that I do not use the nifty new Adobe/DEC/BitStream fonts, but generate
  79. Xand use scaled vfonts instead - the changes to some basic assumptions in
  80. Xxtroff's font code would take a little more work. I'd welcome a scheme for
  81. Xsuch font mapping.
  82. X
  83. XThanks to Dave Cahlander <dac%ni.CRAY.COM@uc.msc.umn.edu> for pointing out a
  84. Xserious bug in Minibuf and a silly mistake in MakeSunFonts. I enclose a
  85. Xcomment from him about better fonts.
  86. X
  87. XEnjoy.
  88. X    Mark Moraes.
  89. X
  90. X---------------------------------------------------------------------------
  91. XDate:     Mon, 10 Oct 88 00:29:34 EDT
  92. XFrom: Dave Cahlander <dac%ni.CRAY.COM@uc.msc.umn.edu>
  93. XMessage-Id: <8810100429.AA06568@quixote.cray.com>
  94. XTo: moraes%csri.toronto.edu@relay.cs.net
  95. XSubject: Re: xtroff on X11R3
  96. XCc: jlf@ni.cray.com, keith@ni.cray.com
  97. XStatus: OR
  98. X
  99. XOn another subject, I really don't like what the scale program does
  100. Xto fonts.  In particular, the devsun.r.10 font derived from /usr/lib/vfonts
  101. Xhas some torn up characters (M, J, etc.).  I have found two sources
  102. Xof fonts on the Sun system:
  103. X
  104. X    1. /usr/NeWS/fonts on our system has the following fonts:
  105. XBtn.ff        CrrBO32.fb    HlvBO32.fb    Smb.ff        TmsI12.fb
  106. XBtn10.fb    CrrO.ff        HlvM.ff        Smb.fm        TmsI14.fb
  107. XBtn12.fb    CrrO.fm        HlvM32.fb    Smb10.fb    TmsI18.fb
  108. XBtn18.fb    CrrO10.fb    HlvO.ff        Smb12.fb    TmsI24.fb
  109. XBtn30.fb    CrrO12.fb    HlvO.fm        Smb14.fb    TmsI26.fb
  110. XBtn35.fb    CrrO14.fb    HlvO10.fb    Smb18.fb    TmsI29.fb
  111. XBtn9.fb        CrrO16.fb    HlvO12.fb    Smb24.fb    TmsI32.fb
  112. XCrl.ff        CrrO18.fb    HlvO14.fb    Smb32.fb    TmsI33.fb
  113. XCrl11.fb    CrrO24.fb    HlvO18.fb    SmbM.ff        TmsI38.fb
  114. XCrr.ff        CrrO32.fb    HlvO24.fb    SmbM32.fb    TmsI43.fb
  115. XCrr.fm        Cursor.ff    HlvO32.fb    TmsB.ff        TmsI47.fb
  116. XCrr1.fb        Cursor12.fb    HrshCyr.ps    TmsB.fm        TmsI53.fb
  117. XCrr10.fb    Dijkstra.ps    HrshGoth.ps    TmsB10.fb    TmsI57.fb
  118. XCrr12.fb    GFont.ff    HrshGrk.ps    TmsB12.fb    TmsI67.fb
  119. XCrr14.fb    GFont12.fb    HrshGrkN.ps    TmsB14.fb    TmsI86.fb
  120. XCrr16.fb    Hlv.ff        HrshGrkp.ps    TmsB18.fb    TmsR.ff
  121. XCrr18.fb    Hlv.fm        HrshI.ps    TmsB24.fb    TmsR.fm
  122. XCrr24.fb    Hlv10.fb    HrshIN.ps    TmsB25.fb    TmsR10.fb
  123. XCrr32.fb    Hlv12.fb    HrshIW.ps    TmsB27.fb    TmsR12.fb
  124. XCrr6.fb        Hlv14.fb    HrshRom.ps    TmsB30.fb    TmsR14.fb
  125. XCrr7.fb        Hlv18.fb    HrshRomN.ps    TmsB32.fb    TmsR16.fb
  126. XCrr8.fb        Hlv24.fb    HrshRomW.ps    TmsB34.fb    TmsR18.fb
  127. XCrr9.fb        Hlv32.fb    HrshRomd.ps    TmsB39.fb    TmsR19.fb
  128. XCrrB.ff        Hlv7.fb        HrshRomp.ps    TmsB44.fb    TmsR20.fb
  129. XCrrB.fm        Hlv9.fb        HrshScr.ps    TmsB49.fb    TmsR23.fb
  130. XCrrB10.fb    HlvB.ff        HrshScrN.ps    TmsB54.fb    TmsR24.fb
  131. XCrrB12.fb    HlvB.fm        Icon.ff        TmsB59.fb    TmsR26.fb
  132. XCrrB14.fb    HlvB10.fb    Icon12.fb    TmsB69.fb    TmsR28.fb
  133. XCrrB16.fb    HlvB12.fb    Icon12.vft    TmsB89.fb    TmsR31.fb
  134. XCrrB18.fb    HlvB14.fb    Kanji.ff    TmsBI.ff    TmsR32.fb
  135. XCrrB24.fb    HlvB18.fb    Kanji16.fb    TmsBI.fm    TmsR36.fb
  136. XCrrB32.fb    HlvB24.fb    Kanji24.fb    TmsBI10.fb    TmsR41.fb
  137. XCrrBO.ff    HlvB32.fb    Scn.ff        TmsBI12.fb    TmsR46.fb
  138. XCrrBO.fm    HlvBO.ff    Scn11.fb    TmsBI14.fb    TmsR51.fb
  139. XCrrBO10.fb    HlvBO.fm    Scn13.fb    TmsBI18.fb    TmsR56.fb
  140. XCrrBO12.fb    HlvBO10.fb    Scn15.fb    TmsBI24.fb    TmsR62.fb
  141. XCrrBO14.fb    HlvBO12.fb    Scn7.fb        TmsBI32.fb    TmsR72.fb
  142. XCrrBO16.fb    HlvBO14.fb    ScnB.ff        TmsI.ff        TmsR9.fb
  143. XCrrBO18.fb    HlvBO18.fb    ScnB13.fb    TmsI.fm        TmsR92.fb
  144. XCrrBO24.fb    HlvBO24.fb    ScnB15.fb    TmsI10.fb
  145. X    There is a program called "dumpfont" that will change these from
  146. X    NeWS format to:
  147. X        1. Adobe (version 1.7)
  148. X        2. vfont
  149. X        3. NeWS
  150. X    As you can guess, the old Adobe format is of no use since "fc"
  151. X    (now called "bdftosnf") can not read it.  I have passed the
  152. X    fonts through:
  153. X        dumpfont -v
  154. X        vf2bdf
  155. X        bdftosnf (fc)
  156. X    and find that what NeWS calls 14 point font, you call 10 point
  157. X    font.
  158. X
  159. X    2. contrib/andrew/overhead/fonts
  160. XMakefile        helvetica16b.fdb    times10.fdb
  161. XMakefile.orig        helvetica16bi.fdb    times10b.fdb
  162. Xcourier10bf.fdb        helvetica16i.fdb    times10bi.fdb
  163. Xcourier10bif.fdb    helvetica22.fdb        times10i.fdb
  164. Xcourier10f.fdb        helvetica22b.fdb    times12.fdb
  165. Xcourier10if.fdb        helvetica22bi.fdb    times12b.fdb
  166. Xcourier12bf.fdb        helvetica22i.fdb    times12bi.fdb
  167. Xcourier12f.fdb        helvetica8.fdb        times12i.fdb
  168. Xcourier8bf.fdb        helvetica8b.fdb        times16.fdb
  169. Xcourier8bif.fdb        helvetica8bi.fdb    times16b.fdb
  170. Xcourier8f.fdb        helvetica8i.fdb        times16bi.fdb
  171. Xcourier8if.fdb        symbol10.fdb        times16i.fdb
  172. Xhelvetica10.fdb        symbol12.fdb        times22.fdb
  173. Xhelvetica10b.fdb    symbol16.fdb        times22b.fdb
  174. Xhelvetica10bi.fdb    symbol22.fdb        times22bi.fdb
  175. Xhelvetica10i.fdb    symbol8.fdb        times22i.fdb
  176. Xhelvetica12.fdb        symbola10.fdb        times8.fdb
  177. Xhelvetica12b.fdb    symbola12.fdb        times8b.fdb
  178. Xhelvetica12bi.fdb    symbola16.fdb        times8bi.fdb
  179. Xhelvetica12i.fdb    symbola22.fdb        times8i.fdb
  180. Xhelvetica16.fdb        symbola8.fdb
  181. X
  182. X    The andrew 10 point font is the same as the NeWS 12 point
  183. X    font.  These can be processed by:
  184. X        fdbtobdf
  185. X        bdftosnf
  186. X
  187. XI have made a Makefile to convert the NeWS fonts to the names
  188. Xthat are acceptable to xtroff:
  189. X    TmsR10.fb -> times.r.10.snf
  190. Xand will do the same with the "andrew" fonts.  This gives a much
  191. Xbetter quality character.
  192. X
  193. XThe problem that I have is that xtroff "knows" about the characters
  194. Xin the 01-0x1f range.  The NeWS fonts have all special characters
  195. Xin the 0x80 and up range.  They go beyound 0xff, and dumpfont
  196. Xgets rid of the characters above 0xff when translating to a vfont.
  197. X
  198. XThe andrew fonts do not have the special characters.
  199. X
  200. XIt may be that some hand editing of the bdf files is required.
  201. X
  202. XWell, I'm sorry that this note has gone on for so long.  I hope 
  203. Xthat some of the information is useful to you.
  204. X
  205. XThanks for your help,
  206. XDavid Cahlander
  207. X
  208. END_OF_CHANGES.R3
  209. if test 6923 -ne `wc -c <CHANGES.R3`; then
  210.     echo shar: \"CHANGES.R3\" unpacked with wrong size!
  211. fi
  212. # end of overwriting check
  213. fi
  214. if test -f update.sh -a "${1}" != "-c" ; then 
  215.   echo shar: Will not over-write existing file \"update.sh\"
  216. else
  217. echo shar: Extracting \"update.sh\" \(27954 characters\)
  218. sed "s/^X//" >update.sh <<'END_OF_update.sh'
  219. X#! /bin/sh
  220. X# Removing some junk files, and renaming the manual page
  221. Xif test -d xtroff ; then
  222. X    cd xtroff
  223. Xfi
  224. Xif test -f suntroff.c -a -f xtroff.man ; then
  225. X    thisdir=`pwd`
  226. Xelse
  227. X    echo 'Please cd to contrib/clients/xtroff before running this script'
  228. X    exit 1
  229. Xfi
  230. Xrm -f Makefile.old Window.c Window.h WindowP.h make.out
  231. Xmv xtroff.man xtroff.manX
  232. Xcd XtStuff
  233. Xrm -f make.out
  234. Xcd $thisdir
  235. X# Ok - this is the real thing.
  236. Xpatch -p1 << \WhAt_A_mArOoN
  237. Xdiff -r -c /h/xwindows/X/contrib/clients/xtroff/patchlevel.h xtroff/patchlevel.h
  238. X*** /h/xwindows/X/contrib/clients/xtroff/patchlevel.h    Mon Sep 26 09:44:48 1988
  239. X--- xtroff/patchlevel.h    Sat Nov 12 06:34:11 1988
  240. X***************
  241. X*** 1,2 ****
  242. X! #define PATCHLEVEL 2
  243. X  
  244. X--- 1,2 ----
  245. X! #define PATCHLEVEL 3
  246. X  
  247. XCommon subdirectories: /h/xwindows/X/contrib/clients/xtroff/Fixes and xtroff/Fixes
  248. Xdiff -r -c /h/xwindows/X/contrib/clients/xtroff/Imakefile xtroff/Imakefile
  249. X*** /h/xwindows/X/contrib/clients/xtroff/Imakefile    Thu Sep  1 01:57:40 1988
  250. X--- xtroff/Imakefile    Sat Nov 12 06:27:36 1988
  251. X***************
  252. X*** 33,39 ****
  253. X  RSTFONTS=/usr/uturing/ron/rst
  254. X  # Xfonts go here - wish the X11 server could read vfonts like 
  255. X  # the X10 server used to.
  256. X! SUNTROFF_FONTS=/local/share/X11/fonts
  257. X  #DEVICE=imp    #imagen
  258. X  DEVICE=sun    #versatec - other printers like lw.
  259. X  WIDTHDIR=/local/share/troff
  260. X--- 33,39 ----
  261. X  RSTFONTS=/usr/uturing/ron/rst
  262. X  # Xfonts go here - wish the X11 server could read vfonts like 
  263. X  # the X10 server used to.
  264. X! SUNTROFF_FONTS=/local/share/X11/fonts/xtroff
  265. X  #DEVICE=imp    #imagen
  266. X  DEVICE=sun    #versatec - other printers like lw.
  267. X  WIDTHDIR=/local/share/troff
  268. X***************
  269. X*** 65,76 ****
  270. X  # These should be defined in an Imake.tmpl - except that the 
  271. X  # normal Imake.tmpl insists on these being compiled in the 
  272. X  # X directory tree.
  273. X! XAWLIB=$(USRLIBDIR)/libXaw.a
  274. X! XTOOLLIB=$(USRLIBDIR)/libXt.a
  275. X! XLIB=$(USRLIBDIR)/libX11.a
  276. X  MATHLIB=-lm
  277. X  
  278. X! FC = fc
  279. X  XTSTUFF =     XtStuff/libXtStuff.a
  280. X  OBJS1 =        xwindows.o suntroff.o parse.o font.o draw.o \
  281. X          fixpoint.o curves.o
  282. X--- 65,76 ----
  283. X  # These should be defined in an Imake.tmpl - except that the 
  284. X  # normal Imake.tmpl insists on these being compiled in the 
  285. X  # X directory tree.
  286. X! #XAWLIB=$(USRLIBDIR)/libXaw.a
  287. X! #XTOOLLIB=$(USRLIBDIR)/libXt.a
  288. X! #XLIB=$(USRLIBDIR)/libX11.a
  289. X  MATHLIB=-lm
  290. X  
  291. X! FC = bdftosnf
  292. X  XTSTUFF =     XtStuff/libXtStuff.a
  293. X  OBJS1 =        xwindows.o suntroff.o parse.o font.o draw.o \
  294. X          fixpoint.o curves.o
  295. X***************
  296. X*** 79,92 ****
  297. X  PROGRAMS =     xtroff
  298. X  PREVIEWER =     xtroff
  299. X  
  300. X! ComplexProgramTarget_1(xtroff,$(XTSTUFF) $(XAWLIB) $(XTOOLLIB) $(XLIB),$(MATHLIB))
  301. X  
  302. X  $(XTSTUFF):
  303. X          cd XtStuff; make $(MFLAGS)            
  304. X  
  305. X  xfonts:
  306. X          -mkdir $(SUNTROFF_FONTS)
  307. X!         cd fontstuff; make $(MFLAGS) CFLAGS="$(CFLAGS)" \
  308. X              VFONTS=$(VFONTS) \
  309. X              RSTFONTS=$(RSTFONTS) PREVIEWER=$(PREVIEWER) \
  310. X              FC=$(FC) PERCENT=$(PERCENT) \
  311. X--- 79,99 ----
  312. X  PROGRAMS =     xtroff
  313. X  PREVIEWER =     xtroff
  314. X  
  315. X! .SUFFIXES: .manX .man
  316. X  
  317. X+ .manX.man:
  318. X+     rm -f $*.man
  319. X+     sed -e 's?WIDTHDIR?$(WIDTHDIR)?g'\
  320. X+         -e 's?FONTDIR?$(SUNTROFF_FONTS)?g' $*.manX > $*.man
  321. X+ 
  322. X+ ComplexProgramTarget_1(xtroff,$(XTSTUFF) $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB),$(MATHLIB))
  323. X+ 
  324. X  $(XTSTUFF):
  325. X          cd XtStuff; make $(MFLAGS)            
  326. X  
  327. X  xfonts:
  328. X          -mkdir $(SUNTROFF_FONTS)
  329. X!         cd fontstuff; make $(MFLAGS) CDEBUGFLAGS="$(CDEBUGFLAGS)" \
  330. X              VFONTS=$(VFONTS) \
  331. X              RSTFONTS=$(RSTFONTS) PREVIEWER=$(PREVIEWER) \
  332. X              FC=$(FC) PERCENT=$(PERCENT) \
  333. X***************
  334. X*** 106,111 ****
  335. X--- 113,119 ----
  336. X  clean::
  337. X          cd XtStuff ; make $(MFLAGS) clean
  338. X          cd fontstuff ; make $(MFLAGS) clean
  339. X+         rm -f xtroff.man
  340. X  
  341. X  depend::
  342. X          cd XtStuff; make $(MFLAGS) depend
  343. XOnly in xtroff: RCS
  344. XCommon subdirectories: /h/xwindows/X/contrib/clients/xtroff/XtStuff and xtroff/XtStuff
  345. XCommon subdirectories: /h/xwindows/X/contrib/clients/xtroff/bitmaps and xtroff/bitmaps
  346. XOnly in xtroff: dave
  347. XCommon subdirectories: /h/xwindows/X/contrib/clients/xtroff/devsun and xtroff/devsun
  348. XCommon subdirectories: /h/xwindows/X/contrib/clients/xtroff/fontstuff and xtroff/fontstuff
  349. Xdiff -r -c /h/xwindows/X/contrib/clients/xtroff/xwindows.c xtroff/xwindows.c
  350. X*** /h/xwindows/X/contrib/clients/xtroff/xwindows.c    Fri Sep 23 10:16:37 1988
  351. X--- xtroff/xwindows.c    Sat Nov 12 06:26:52 1988
  352. X***************
  353. X*** 19,25 ****
  354. X   *  X11.  - Mark Moraes.
  355. X   */
  356. X  #ifndef lint
  357. X! static char rcsid[]="$Header";
  358. X  #endif
  359. X  
  360. X  #include    <stdio.h>
  361. X--- 19,25 ----
  362. X   *  X11.  - Mark Moraes.
  363. X   */
  364. X  #ifndef lint
  365. X! static char rcsid[]="$Header: xwindows.c,v 1.1 88/11/12 06:26:27 moraes Exp $";
  366. X  #endif
  367. X  
  368. X  #include    <stdio.h>
  369. X***************
  370. X*** 175,180 ****
  371. X--- 175,181 ----
  372. X  static XColor bg = {0, 0, 0, 0};
  373. X  static XColor fg = {0, ~0, ~0, ~0};
  374. X  unsigned int depth;
  375. X+ Dimension xwidth, xheight;
  376. X  
  377. X  Display *dpy;
  378. X  Screen *scn;
  379. X***************
  380. X*** 207,214 ****
  381. X  static Arg query_args[] = {
  382. X      {XtNbackground, (XtArgVal) &bgcolor},
  383. X      {XtNforeground, (XtArgVal) &fgcolor},
  384. X!     {XtNwidth, (XtArgVal) &ViewWidth},
  385. X!     {XtNheight, (XtArgVal) &ViewHeight},
  386. X  };
  387. X  
  388. X  /* args for the canvas window - we fill in translations by hand */
  389. X--- 208,215 ----
  390. X  static Arg query_args[] = {
  391. X      {XtNbackground, (XtArgVal) &bgcolor},
  392. X      {XtNforeground, (XtArgVal) &fgcolor},
  393. X!     {XtNwidth, (XtArgVal) &xwidth},
  394. X!     {XtNheight, (XtArgVal) &xheight},
  395. X  };
  396. X  
  397. X  /* args for the canvas window - we fill in translations by hand */
  398. X***************
  399. X*** 237,247 ****
  400. X   *  XtNfromHoriz also changes to XtNfromVert.
  401. X   */
  402. X  static Arg scroll_args[] = {
  403. X!     XtNlength, (XtArgVal) 850,
  404. X!     XtNorientation, (XtArgVal) XtorientVertical,
  405. X!     XtNfromHoriz, (XtArgVal) NULL,
  406. X!     XtNscrollProc, (XtArgVal) scrollCallbacks,
  407. X!     XtNthumbProc, (XtArgVal) thumbCallbacks,
  408. X  };
  409. X  
  410. X  static MenuItemsList menu_list[] = {
  411. X--- 238,250 ----
  412. X   *  XtNfromHoriz also changes to XtNfromVert.
  413. X   */
  414. X  static Arg scroll_args[] = {
  415. X!     {XtNlength, (XtArgVal) 850},
  416. X!     {XtNorientation, (XtArgVal) XtorientVertical},
  417. X!     {XtNfromHoriz, (XtArgVal) NULL},
  418. X!     {XtNtop, (XtArgVal) 0.0},
  419. X!     {XtNshown, (XtArgVal) 0.0},
  420. X!     {XtNscrollProc, (XtArgVal) scrollCallbacks},
  421. X!     {XtNthumbProc, (XtArgVal) thumbCallbacks},
  422. X  };
  423. X  
  424. X  static MenuItemsList menu_list[] = {
  425. X***************
  426. X*** 349,358 ****
  427. X--- 352,367 ----
  428. X      CanvasWidget = XtCreateManagedWidget("canvas", windowWidgetClass, 
  429. X       BaseFrame, canvas_args, XtNumber(canvas_args));
  430. X      XtGetValues(CanvasWidget, query_args, XtNumber(query_args));
  431. X+     ViewWidth = xwidth;
  432. X+     ViewHeight = xheight;
  433. X      if (Scrollbars) {
  434. X          /* vertical scrollbar to the right of the canvas */
  435. X          XtSetArg(scroll_args[0], XtNlength, ViewHeight);
  436. X          XtSetArg(scroll_args[2], XtNfromHoriz, CanvasWidget);
  437. X+         XtSetArg(scroll_args[3], XtNtop, 
  438. X+          (float) ((float) ViewTop / (float) PAGE_PIXEL_HEIGHT));
  439. X+         XtSetArg(scroll_args[4], XtNshown, 
  440. X+          (float) ((float) ViewHeight / (float) PAGE_PIXEL_HEIGHT));
  441. X          VertScroll = XtCreateManagedWidget("vscroll", 
  442. X           scrollbarWidgetClass, BaseFrame, 
  443. X           scroll_args, XtNumber(scroll_args));
  444. X***************
  445. X*** 360,365 ****
  446. X--- 369,378 ----
  447. X          XtSetArg(scroll_args[0], XtNlength, ViewWidth);
  448. X          XtSetArg(scroll_args[1], XtNorientation, XtorientHorizontal);
  449. X          XtSetArg(scroll_args[2], XtNfromVert, CanvasWidget);
  450. X+         XtSetArg(scroll_args[3], XtNtop, 
  451. X+          (float) ((float) ViewLeft / (float) PAGE_PIXEL_WIDTH));
  452. X+         XtSetArg(scroll_args[4], XtNshown, 
  453. X+          (float) ((float) ViewWidth / (float) PAGE_PIXEL_WIDTH));
  454. X          HorizScroll = XtCreateManagedWidget("hscroll", 
  455. X           scrollbarWidgetClass, BaseFrame, 
  456. X           scroll_args, XtNumber(scroll_args));
  457. X***************
  458. X*** 388,397 ****
  459. X          minibuf_args[2].value = (XtArgVal) CanvasWidget;
  460. X      InputWidget = XtCreateManagedWidget("minibuf", minibufWidgetClass,
  461. X          BaseFrame, minibuf_args, XtNumber(minibuf_args));
  462. X-     if (Scrollbars)
  463. X-         SetScrollBar();
  464. X      XtRealizeWidget(topLevel);
  465. X      XFlush(dpy);
  466. X      DrawingCanvas = XtWindow(CanvasWidget);
  467. X      OuterFrame = XtWindow(topLevel);
  468. X      InputWin = XtWindow(InputWidget);
  469. X--- 401,410 ----
  470. X          minibuf_args[2].value = (XtArgVal) CanvasWidget;
  471. X      InputWidget = XtCreateManagedWidget("minibuf", minibufWidgetClass,
  472. X          BaseFrame, minibuf_args, XtNumber(minibuf_args));
  473. X      XtRealizeWidget(topLevel);
  474. X      XFlush(dpy);
  475. X+     if (Scrollbars)
  476. X+         SetScrollBar();
  477. X      DrawingCanvas = XtWindow(CanvasWidget);
  478. X      OuterFrame = XtWindow(topLevel);
  479. X      InputWin = XtWindow(InputWidget);
  480. X***************
  481. X*** 768,778 ****
  482. X  }
  483. X  
  484. X  
  485. X! static void Thumbed(w, closure, top)
  486. X  Widget w;
  487. X  caddr_t closure;
  488. X! float top;
  489. X  {
  490. X  #ifdef WINDOWDEBUG
  491. X      printf( "thumbed to %f%%\n", top );
  492. X  #endif
  493. X--- 781,792 ----
  494. X  }
  495. X  
  496. X  
  497. X! static void Thumbed(w, closure, percent)
  498. X  Widget w;
  499. X  caddr_t closure;
  500. X! caddr_t percent;
  501. X  {
  502. X+     float top = *((float *) percent);
  503. X  #ifdef WINDOWDEBUG
  504. X      printf( "thumbed to %f%%\n", top );
  505. X  #endif
  506. Xdiff -r -c /h/xwindows/X/contrib/clients/xtroff/XtStuff/CheckItem.c xtroff/XtStuff/CheckItem.c
  507. X*** /h/xwindows/X/contrib/clients/xtroff/XtStuff/CheckItem.c    Fri Jun 10 01:20:10 1988
  508. X--- xtroff/XtStuff/CheckItem.c    Fri Nov 11 23:53:27 1988
  509. X***************
  510. X*** 121,126 ****
  511. X--- 121,128 ----
  512. X      NULL,                                  /* callback_private    */
  513. X      defaultTranslations,           /* tm_table          */
  514. X      NULL,                                  /* query_geometry    */
  515. X+     /* display_accelerator    */    XtInheritDisplayAccelerator,
  516. X+     /* extension        */    NULL
  517. X    },  /* CoreClass fields initialization */
  518. X    {
  519. X      0,                                     /* field not used    */
  520. Xdiff -r -c /h/xwindows/X/contrib/clients/xtroff/XtStuff/CheckItem.h xtroff/XtStuff/CheckItem.h
  521. X*** /h/xwindows/X/contrib/clients/xtroff/XtStuff/CheckItem.h    Fri Jun 10 01:20:10 1988
  522. X--- xtroff/XtStuff/CheckItem.h    Fri Nov 11 23:44:49 1988
  523. X***************
  524. X*** 43,61 ****
  525. X   *
  526. X   ***********************************************************************/
  527. X  
  528. X- #ifndef _XtJustify_e
  529. X- #define _XtJustify_e
  530. X- 
  531. X- 
  532. X- 
  533. X- 
  534. X- typedef enum {
  535. X-     XtJustifyLeft,       /* justify text to left side of button   */
  536. X-     XtJustifyCenter,     /* justify text in center of button      */
  537. X-     XtJustifyRight       /* justify text to right side of button  */
  538. X- } XtJustify;
  539. X- #endif _XtJustify_e
  540. X- 
  541. X  #define XtNcallback        "callback"
  542. X  #define XtNhighlightThickness   "hightlightThickness"
  543. X  #define XtNtranslations        "translations"
  544. X--- 43,48 ----
  545. Xdiff -r -c /h/xwindows/X/contrib/clients/xtroff/XtStuff/Menu.c xtroff/XtStuff/Menu.c
  546. X*** /h/xwindows/X/contrib/clients/xtroff/XtStuff/Menu.c    Fri Jun 10 01:20:11 1988
  547. X--- xtroff/XtStuff/Menu.c    Sat Nov 12 00:20:49 1988
  548. X***************
  549. X*** 37,47 ****
  550. X  
  551. X  #include    <X11/IntrinsicP.h>
  552. X  #include    <X11/StringDefs.h>
  553. X! #include    <X11/Misc.h>
  554. X  #include    "MenuP.h"
  555. X  #include    "MenuItem.h"
  556. X  #include    "CheckItem.h"
  557. X! #include        <X11/Label.h>
  558. X  #include    <ctype.h>
  559. X  
  560. X  /****************************************************************
  561. X--- 37,48 ----
  562. X  
  563. X  #include    <X11/IntrinsicP.h>
  564. X  #include    <X11/StringDefs.h>
  565. X! #include    <X11/XawMisc.h>
  566. X! #include    <X11/Xmu.h>
  567. X  #include    "MenuP.h"
  568. X  #include    "MenuItem.h"
  569. X  #include    "CheckItem.h"
  570. X! #include     <X11/Label.h>
  571. X  #include    <ctype.h>
  572. X  
  573. X  /****************************************************************
  574. X***************
  575. X*** 56,64 ****
  576. X       XtOffset(MenuWidget, menu.x_margin), XtRString, "0"},
  577. X      {XtNyMargin, XtCVSpace, XtRInt, sizeof(int),
  578. X       XtOffset(MenuWidget, menu.y_margin), XtRString, "0"},
  579. X!     {XtNx, XtCPosition, XtRInt, sizeof(int),
  580. X           XtOffset(MenuWidget,core.x),XtRString, "800"},
  581. X!     {XtNy, XtCPosition, XtRInt, sizeof(int),
  582. X           XtOffset(MenuWidget,core.y),XtRString, "800"},
  583. X      {XtNborder,"MyBorder",XtRPixel,sizeof(Pixel),
  584. X           XtOffset(MenuWidget,core.border_pixel),XtRString, "Black"},
  585. X--- 57,65 ----
  586. X       XtOffset(MenuWidget, menu.x_margin), XtRString, "0"},
  587. X      {XtNyMargin, XtCVSpace, XtRInt, sizeof(int),
  588. X       XtOffset(MenuWidget, menu.y_margin), XtRString, "0"},
  589. X!     {XtNx, XtCPosition, XtRPosition, sizeof(Position),
  590. X           XtOffset(MenuWidget,core.x),XtRString, "800"},
  591. X!     {XtNy, XtCPosition, XtRPosition, sizeof(Position),
  592. X           XtOffset(MenuWidget,core.y),XtRString, "800"},
  593. X      {XtNborder,"MyBorder",XtRPixel,sizeof(Pixel),
  594. X           XtOffset(MenuWidget,core.border_pixel),XtRString, "Black"},
  595. X***************
  596. X*** 72,78 ****
  597. X           XtOffset(MenuWidget,menu.check_foreground_pixel),XtRString, "Black"},
  598. X      {XtNbackground, XtCBackground,XtRPixel, sizeof(Pixel),
  599. X           XtOffset(MenuWidget,core.background_pixel),XtRString, "White"},
  600. X!     {XtNborderWidth, XtCBorderWidth, XtRInt, sizeof(int),
  601. X           XtOffset(MenuWidget,core.border_width),XtRString, "2"},
  602. X      {XtNorientation, XtCOrientation, XtROrientation, sizeof(XtOrientation),
  603. X           XtOffset(MenuWidget,menu.orient),XtRString, "vertical"},
  604. X--- 73,79 ----
  605. X           XtOffset(MenuWidget,menu.check_foreground_pixel),XtRString, "Black"},
  606. X      {XtNbackground, XtCBackground,XtRPixel, sizeof(Pixel),
  607. X           XtOffset(MenuWidget,core.background_pixel),XtRString, "White"},
  608. X!     {XtNborderWidth, XtCBorderWidth, XtRDimension, sizeof(Dimension),
  609. X           XtOffset(MenuWidget,core.border_width),XtRString, "2"},
  610. X      {XtNorientation, XtCOrientation, XtROrientation, sizeof(XtOrientation),
  611. X           XtOffset(MenuWidget,menu.orient),XtRString, "vertical"},
  612. X***************
  613. X*** 126,131 ****
  614. X--- 127,134 ----
  615. X      /* callback_private   */    NULL,
  616. X      /* tm_table           */    NULL,
  617. X      /* query_geometry     */    NULL,
  618. X+     /* display_accelerator    */    XtInheritDisplayAccelerator,
  619. X+     /* extension        */    NULL
  620. X    },{
  621. X  /* composite_class fields */
  622. X      /* geometry_manager   */    GeometryManager,
  623. X***************
  624. X*** 132,139 ****
  625. X      /* change_managed     */    ChangeManaged,
  626. X      /* insert_child      */    NULL,    /* Inherit from superclass */
  627. X      /* delete_child      */    NULL,    /* Inherit from superclass */
  628. X-     /* move_focus_to_next */    NULL,
  629. X-     /* move_focus_to_prev */    NULL
  630. X    },{
  631. X      /* mumble          */    0    /* Make C compiler happy   */
  632. X    }
  633. X--- 135,140 ----
  634. Xdiff -r -c /h/xwindows/X/contrib/clients/xtroff/XtStuff/Menu.h xtroff/XtStuff/Menu.h
  635. X*** /h/xwindows/X/contrib/clients/xtroff/XtStuff/Menu.h    Fri Jun 10 01:20:11 1988
  636. X--- xtroff/XtStuff/Menu.h    Fri Nov 11 23:44:49 1988
  637. X***************
  638. X*** 58,68 ****
  639. X  #define XtitemCheckable        0x02    /* 0=uncheckable, 1=checkable    */
  640. X  #define XtitemIsChecked        0x01    /* 0=unchecked, 1=checked    */
  641. X  
  642. X- #ifndef _XtOrientation_e
  643. X- #define _XtOrientation_e
  644. X- typedef enum {XtorientHorizontal, XtorientVertical} XtOrientation;
  645. X- #endif _XtOrientation_e
  646. X- 
  647. X  /* Class record constants */
  648. X  
  649. X  extern WidgetClass menuWidgetClass;
  650. X--- 58,63 ----
  651. Xdiff -r -c /h/xwindows/X/contrib/clients/xtroff/XtStuff/MenuItem.c xtroff/XtStuff/MenuItem.c
  652. X*** /h/xwindows/X/contrib/clients/xtroff/XtStuff/MenuItem.c    Fri Jul  8 05:42:16 1988
  653. X--- xtroff/XtStuff/MenuItem.c    Fri Nov 11 23:53:27 1988
  654. X***************
  655. X*** 116,121 ****
  656. X--- 116,123 ----
  657. X      NULL,                                  /* callback_private    */
  658. X      defaultTranslations,           /* tm_table          */
  659. X      NULL,                                  /* query_geometry    */
  660. X+     /* display_accelerator    */    XtInheritDisplayAccelerator,
  661. X+     /* extension        */    NULL
  662. X    },  /* CoreClass fields initialization */
  663. X    {
  664. X      0,                                     /* field not used    */
  665. Xdiff -r -c /h/xwindows/X/contrib/clients/xtroff/XtStuff/MenuItem.h xtroff/XtStuff/MenuItem.h
  666. X*** /h/xwindows/X/contrib/clients/xtroff/XtStuff/MenuItem.h    Fri Jun 10 01:20:11 1988
  667. X--- xtroff/XtStuff/MenuItem.h    Fri Nov 11 23:42:35 1988
  668. X***************
  669. X*** 43,61 ****
  670. X   *
  671. X   ***********************************************************************/
  672. X  
  673. X- #ifndef _XtJustify_e
  674. X- #define _XtJustify_e
  675. X- 
  676. X- 
  677. X- 
  678. X- 
  679. X- typedef enum {
  680. X-     XtJustifyLeft,       /* justify text to left side of button   */
  681. X-     XtJustifyCenter,     /* justify text in center of button      */
  682. X-     XtJustifyRight       /* justify text to right side of button  */
  683. X- } XtJustify;
  684. X- #endif _XtJustify_e
  685. X- 
  686. X  #define XtNcallback        "callback"
  687. X  #define XtNhighlightThickness   "hightlightThickness"
  688. X  #define XtNtranslations        "translations"
  689. X--- 43,48 ----
  690. Xdiff -r -c /h/xwindows/X/contrib/clients/xtroff/XtStuff/Minibuf.c xtroff/XtStuff/Minibuf.c
  691. X*** /h/xwindows/X/contrib/clients/xtroff/XtStuff/Minibuf.c    Wed Aug 31 18:23:45 1988
  692. X--- xtroff/XtStuff/Minibuf.c    Sat Nov 12 04:35:06 1988
  693. X***************
  694. X*** 79,85 ****
  695. X  #define BUF_BLOCK         128
  696. X  
  697. X  #define MIN_COLS         5
  698. X! #define DEFAULTFONT        "Fixed"
  699. X  #define ABORT_MSG        "[Aborted]"
  700. X  #define DELAY            300000        /*
  701. X                                       *  Microseconds of delay for cursor
  702. X--- 79,85 ----
  703. X  #define BUF_BLOCK         128
  704. X  
  705. X  #define MIN_COLS         5
  706. X! #define DEFAULTFONT        "8x13"
  707. X  #define ABORT_MSG        "[Aborted]"
  708. X  #define DELAY            300000        /*
  709. X                                       *  Microseconds of delay for cursor
  710. X***************
  711. X*** 170,176 ****
  712. X      {XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel),
  713. X       offset(minibuf.foreground), XtRString, "Black"},
  714. X      {XtNfont,  XtCFont, XtRFontStruct, sizeof(XFontStruct *),
  715. X!      offset(minibuf.finfo),XtRString, "Fixed"},
  716. X      {XtNcursor, XtCCursor, XtRCursor, sizeof(Cursor),
  717. X       offset(minibuf.cursor), XtRString, "xterm"},
  718. X      {XtNfinishedCallback, XtCCallback, XtRCallback, sizeof(XtProc),
  719. X--- 170,176 ----
  720. X      {XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel),
  721. X       offset(minibuf.foreground), XtRString, "Black"},
  722. X      {XtNfont,  XtCFont, XtRFontStruct, sizeof(XFontStruct *),
  723. X!      offset(minibuf.finfo),XtRString, DEFAULTFONT},
  724. X      {XtNcursor, XtCCursor, XtRCursor, sizeof(Cursor),
  725. X       offset(minibuf.cursor), XtRString, "xterm"},
  726. X      {XtNfinishedCallback, XtCCallback, XtRCallback, sizeof(XtProc),
  727. X***************
  728. X*** 220,225 ****
  729. X--- 220,227 ----
  730. X          NULL,                            /* callback_private          */
  731. X          defaultTranslations,            /* tm_table                  */
  732. X          NULL,                            /* query_geometry          */
  733. X+         XtInheritDisplayAccelerator,    /* display_accelerator    */
  734. X+         NULL                            /* extension        */
  735. X      },  /* CoreClass fields initialization */
  736. X      {
  737. X          0,                                /* field not used        */
  738. X***************
  739. X*** 257,264 ****
  740. X          mcore(height) = fontheight(mbuf(finfo));
  741. X  
  742. X      if (mbuf(finfo)->per_char != NULL) {
  743. X          /* default font since we must have a fixed width font */
  744. X!         XtConvert(new, XtRString, (XrmValuePtr) DEFAULTFONT,
  745. X           XtRFontStruct, (XrmValuePtr) mbuf(finfo));
  746. X  #ifdef DEBUG
  747. X          fprintf(stderr, "Need fixed font - falling back on default \"%s\"\n",
  748. X--- 259,269 ----
  749. X          mcore(height) = fontheight(mbuf(finfo));
  750. X  
  751. X      if (mbuf(finfo)->per_char != NULL) {
  752. X+         XrmValue value;
  753. X+         value.size = sizeof(DEFAULTFONT);
  754. X+         value.addr = DEFAULTFONT;
  755. X          /* default font since we must have a fixed width font */
  756. X!         XtConvert(new, XtRString, &value,
  757. X           XtRFontStruct, (XrmValuePtr) mbuf(finfo));
  758. X  #ifdef DEBUG
  759. X          fprintf(stderr, "Need fixed font - falling back on default \"%s\"\n",
  760. Xdiff -r -c /h/xwindows/X/contrib/clients/xtroff/XtStuff/Window.c xtroff/XtStuff/Window.c
  761. X*** /h/xwindows/X/contrib/clients/xtroff/XtStuff/Window.c    Thu Aug 18 23:55:31 1988
  762. X--- xtroff/XtStuff/Window.c    Sat Nov 12 01:10:51 1988
  763. X***************
  764. X*** 79,84 ****
  765. X--- 79,87 ----
  766. X      /* version            */    XtVersion,
  767. X      /* callback_private   */    NULL,
  768. X      /* tm_table           */    NULL,
  769. X+     /* query_geometry     */    NULL,
  770. X+     /* display_accelerator*/    XtInheritDisplayAccelerator,
  771. X+     /* extension          */    NULL
  772. X    }
  773. X  };
  774. X  
  775. Xdiff -r -c /h/xwindows/X/contrib/clients/xtroff/XtStuff/Window.h xtroff/XtStuff/Window.h
  776. X*** /h/xwindows/X/contrib/clients/xtroff/XtStuff/Window.h    Thu Aug 18 23:55:44 1988
  777. X--- xtroff/XtStuff/Window.h    Sat Nov 12 00:02:01 1988
  778. X***************
  779. X*** 11,17 ****
  780. X   *
  781. X   ***********************************************************************/
  782. X  
  783. X- #define XtNpixmap    "Pixmap"
  784. X  #define XtCpixmap    "Pixmap"
  785. X  
  786. X  /* Class record constants */
  787. X--- 11,16 ----
  788. Xdiff -r -c /h/xwindows/X/contrib/clients/xtroff/fontstuff/MakeImFonts xtroff/fontstuff/MakeImFonts
  789. X*** /h/xwindows/X/contrib/clients/xtroff/fontstuff/MakeImFonts    Thu Sep  1 00:06:10 1988
  790. X--- xtroff/fontstuff/MakeImFonts    Sat Nov 12 02:34:18 1988
  791. X***************
  792. X*** 23,29 ****
  793. X  if test x$XWIN != x ; then
  794. X      if test $XWIN != suntroff ; then
  795. X          XWIN=x
  796. X!         FC=${5-fc}
  797. X      else
  798. X          XWIN=
  799. X          FC=
  800. X--- 23,29 ----
  801. X  if test x$XWIN != x ; then
  802. X      if test $XWIN != suntroff ; then
  803. X          XWIN=x
  804. X!         FC=${5-bdftosnf}
  805. X      else
  806. X          XWIN=
  807. X          FC=
  808. X***************
  809. X*** 62,68 ****
  810. X          NewSize=`expr $Size \* 100 / $PERCENT`
  811. X          if test x$XWIN != x ; then
  812. X              fname=`echo $Font | tr A-Z a-z`
  813. X!             fname=$DEVICE.$fname.$NewSize.snf
  814. X          else
  815. X              fname=$Font.$NewSize
  816. X          fi
  817. X--- 62,69 ----
  818. X          NewSize=`expr $Size \* 100 / $PERCENT`
  819. X          if test x$XWIN != x ; then
  820. X              fname=`echo $Font | tr A-Z a-z`
  821. X!             fontname=$DEVICE.$fname.$NewSize
  822. X!             fname=$fontname.snf
  823. X          else
  824. X              fname=$Font.$NewSize
  825. X          fi
  826. X***************
  827. X*** 76,82 ****
  828. X                      $SUNTROFF_FONTS/$fname
  829. X              else
  830. X                  $BIN_DIR/ch2vft $TEMP > $TEMP2
  831. X!                 $BIN_DIR/vf2bdf $TEMP2 $NewSize |
  832. X                  $FC > $SUNTROFF_FONTS/$fname
  833. X              fi
  834. X  
  835. X--- 77,84 ----
  836. X                      $SUNTROFF_FONTS/$fname
  837. X              else
  838. X                  $BIN_DIR/ch2vft $TEMP > $TEMP2
  839. X!                 $BIN_DIR/vf2bdf $TEMP2 $NewSize | \
  840. X!                 sed 's?^FONT .*$?FONT '$fontname'?' | \
  841. X                  $FC > $SUNTROFF_FONTS/$fname
  842. X              fi
  843. X  
  844. X***************
  845. X*** 103,118 ****
  846. X          else
  847. X              extension=
  848. X          fi
  849. X!         f1=$SUNTROFF_FONTS/$Font.`expr $Size - 1`$extension
  850. X!         f2=$SUNTROFF_FONTS/$Font.`expr $Size`$extension
  851. X!         f3=$SUNTROFF_FONTS/$Font.`expr $Size + 1`$extension
  852. X  
  853. X          if [ -r $f1 -o -r $f2 -o -r $f3 ]
  854. X          then
  855. X              true
  856. X          else
  857. X              echo scaling and converting $RSTFONTS/$i to \
  858. X!                 $SUNTROFF_FONTS/$DEVICE.$Font.$Size$extension
  859. X              $BIN_DIR/rst2ch $RSTFONTS/$i > $TEMP
  860. X              $BIN_DIR/scalech -s$PERCENT  $TEMP > $TEMP2
  861. X              if test x$XWIN = x ; then
  862. X--- 105,129 ----
  863. X          else
  864. X              extension=
  865. X          fi
  866. X!         if [ x$XWIN = x ]
  867. X!         then
  868. X!             f1=$SUNTROFF_FONTS/$Font.`expr $Size - 1`$extension
  869. X!             f2=$SUNTROFF_FONTS/$Font.`expr $Size`$extension
  870. X!             f3=$SUNTROFF_FONTS/$Font.`expr $Size + 1`$extension
  871. X!         else
  872. X!             f1=$SUNTROFF_FONTS/$DEVICE.$Font.`expr $Size - 1`$extension
  873. X!             f2=$SUNTROFF_FONTS/$DEVICE.$Font.`expr $Size`$extension
  874. X!             f3=$SUNTROFF_FONTS/$DEVICE.$Font.`expr $Size + 1`$extension
  875. X!         fi
  876. X  
  877. X          if [ -r $f1 -o -r $f2 -o -r $f3 ]
  878. X          then
  879. X              true
  880. X          else
  881. X+             fontname=$DEVICE.$Font.$Size
  882. X+             fname=$fontname$extension
  883. X              echo scaling and converting $RSTFONTS/$i to \
  884. X!                 $SUNTROFF_FONTS/$fname
  885. X              $BIN_DIR/rst2ch $RSTFONTS/$i > $TEMP
  886. X              $BIN_DIR/scalech -s$PERCENT  $TEMP > $TEMP2
  887. X              if test x$XWIN = x ; then
  888. X***************
  889. X*** 120,127 ****
  890. X              else
  891. X                  $BIN_DIR/ch2vft $TEMP2 > $TEMP
  892. X                  $BIN_DIR/vf2bdf $TEMP $Size |
  893. X!                 $FC > $SUNTROFF_FONTS/$DEVICE.$Font.$Size$extension
  894. X              fi
  895. X          fi
  896. X      fi
  897. X  done
  898. X--- 131,142 ----
  899. X              else
  900. X                  $BIN_DIR/ch2vft $TEMP2 > $TEMP
  901. X                  $BIN_DIR/vf2bdf $TEMP $Size |
  902. X!                 sed 's?^FONT .*$?FONT '$fontname'?' | \
  903. X!                 $FC > $SUNTROFF_FONTS/$fname
  904. X              fi
  905. X          fi
  906. X      fi
  907. X  done
  908. X+ if [ x$XWIN != x ]; then
  909. X+     mkfontdir $SUNTROFF_FONTS
  910. X+ fi
  911. Xdiff -r -c /h/xwindows/X/contrib/clients/xtroff/fontstuff/MakeSunFonts xtroff/fontstuff/MakeSunFonts
  912. X*** /h/xwindows/X/contrib/clients/xtroff/fontstuff/MakeSunFonts    Thu Sep  1 01:42:57 1988
  913. X--- xtroff/fontstuff/MakeSunFonts    Sat Nov 12 02:34:17 1988
  914. X***************
  915. X*** 22,28 ****
  916. X  if test x$XWIN != x ; then
  917. X      if test $XWIN != suntroff ; then
  918. X          XWIN=x
  919. X!         FC=${5-fc}
  920. X      else
  921. X          XWIN=
  922. X          FC=
  923. X--- 22,28 ----
  924. X  if test x$XWIN != x ; then
  925. X      if test $XWIN != suntroff ; then
  926. X          XWIN=x
  927. X!         FC=${5-bdftosnf}
  928. X      else
  929. X          XWIN=
  930. X          FC=
  931. X***************
  932. X*** 69,75 ****
  933. X          NewSize=`expr $Size \* 100 / $PERCENT`
  934. X          if test x$XWIN != x ; then
  935. X              fname=`echo $Font | tr A-Z a-z`
  936. X!             fname=$DEVICE.$fname.$NewSize.snf
  937. X          else
  938. X              fname=$Font.$NewSize
  939. X          fi
  940. X--- 69,76 ----
  941. X          NewSize=`expr $Size \* 100 / $PERCENT`
  942. X          if test x$XWIN != x ; then
  943. X              fname=`echo $Font | tr A-Z a-z`
  944. X!             fontname=$DEVICE.$fname.$NewSize
  945. X!             fname=$fontname.snf
  946. X          else
  947. X              fname=$Font.$NewSize
  948. X          fi
  949. X***************
  950. X*** 82,87 ****
  951. X--- 83,89 ----
  952. X                            $SUNTROFF_FONTS/$fname
  953. X              else
  954. X                  $BIN_DIR/vf2bdf $VFONTS/$i $NewSize | \
  955. X+                 sed 's?^FONT .*$?FONT '$fontname'?' | \
  956. X                  $FC > $SUNTROFF_FONTS/$fname
  957. X              fi
  958. X          fi
  959. X***************
  960. X*** 107,122 ****
  961. X          else
  962. X              extension=
  963. X          fi
  964. X!         f1=$SUNTROFF_FONTS/$Font.`expr $Size - 1`$extension
  965. X!         f2=$SUNTROFF_FONTS/$Font.`expr $Size`$extension
  966. X!         f3=$SUNTROFF_FONTS/$Font.`expr $Size + 1`$extension
  967. X  
  968. X          if [ -r $f1 -o -r $f2 -o -r $f3 ]
  969. X          then
  970. X              true
  971. X          else
  972. X              echo scaling and converting $VFONTS/$i to \
  973. X!                 $SUNTROFF_FONTS/$DEVICE.$Font.$Size$extension
  974. X              $BIN_DIR/vft2ch $VFONTS/$i > $TEMP
  975. X              $BIN_DIR/scalech -s$PERCENT  $TEMP > $TEMP2
  976. X              if test x$XWIN = x ; then
  977. X--- 109,133 ----
  978. X          else
  979. X              extension=
  980. X          fi
  981. X!         if [ x$XWIN = x ]
  982. X!         then
  983. X!             f1=$SUNTROFF_FONTS/$Font.`expr $Size - 1`$extension
  984. X!             f2=$SUNTROFF_FONTS/$Font.`expr $Size`$extension
  985. X!             f3=$SUNTROFF_FONTS/$Font.`expr $Size + 1`$extension
  986. X!         else
  987. X!             f1=$SUNTROFF_FONTS/$DEVICE.$Font.`expr $Size - 1`$extension
  988. X!             f2=$SUNTROFF_FONTS/$DEVICE.$Font.`expr $Size`$extension
  989. X!             f3=$SUNTROFF_FONTS/$DEVICE.$Font.`expr $Size + 1`$extension
  990. X!         fi
  991. X  
  992. X          if [ -r $f1 -o -r $f2 -o -r $f3 ]
  993. X          then
  994. X              true
  995. X          else
  996. X+             fontname=$DEVICE.$Font.$Size
  997. X+             fname=$fontname$extension
  998. X              echo scaling and converting $VFONTS/$i to \
  999. X!                 $SUNTROFF_FONTS/$fname
  1000. X              $BIN_DIR/vft2ch $VFONTS/$i > $TEMP
  1001. X              $BIN_DIR/scalech -s$PERCENT  $TEMP > $TEMP2
  1002. X              if test x$XWIN = x ; then
  1003. X***************
  1004. X*** 124,131 ****
  1005. X              else
  1006. X                  $BIN_DIR/ch2vft $TEMP2 > $TEMP
  1007. X                  $BIN_DIR/vf2bdf $TEMP $Size |
  1008. X!                 $FC > $SUNTROFF_FONTS/$DEVICE.$Font.$Size$extension
  1009. X              fi
  1010. X          fi
  1011. X      fi
  1012. X  done
  1013. X--- 135,146 ----
  1014. X              else
  1015. X                  $BIN_DIR/ch2vft $TEMP2 > $TEMP
  1016. X                  $BIN_DIR/vf2bdf $TEMP $Size |
  1017. X!                 sed 's?^FONT .*$?FONT '$fontname'?' | \
  1018. X!                 $FC > $SUNTROFF_FONTS/$fname
  1019. X              fi
  1020. X          fi
  1021. X      fi
  1022. X  done
  1023. X+ if [ x$XWIN != x ]; then
  1024. X+     mkfontdir $SUNTROFF_FONTS
  1025. X+ fi
  1026. Xdiff -r -c /h/xwindows/X/contrib/clients/xtroff/fontstuff/Makefile xtroff/fontstuff/Makefile
  1027. X*** /h/xwindows/X/contrib/clients/xtroff/fontstuff/Makefile    Thu Sep  1 00:13:25 1988
  1028. X--- xtroff/fontstuff/Makefile    Sat Nov 12 01:37:44 1988
  1029. X***************
  1030. X*** 1,5 ****
  1031. X  #    Not standalone - it gets a lot of variables from the invocation.
  1032. X! #    VFONTS, RSTFONTS, SUNTROFF_FONTS, PERCENT, PREVIEWER, FC
  1033. X  
  1034. X  all: install
  1035. X  
  1036. X--- 1,7 ----
  1037. X  #    Not standalone - it gets a lot of variables from the invocation.
  1038. X! #    VFONTS, RSTFONTS, SUNTROFF_FONTS, PERCENT, PREVIEWER, FC, CDEBUGFLAGS
  1039. X! 
  1040. X! CFLAGS = $(CDEBUGFLAGS)
  1041. X  
  1042. X  all: install
  1043. X  
  1044. Xdiff -r -c /h/xwindows/X/contrib/clients/xtroff/fontstuff/vf2bdf.c xtroff/fontstuff/vf2bdf.c
  1045. X*** /h/xwindows/X/contrib/clients/xtroff/fontstuff/vf2bdf.c    Fri Jun 10 02:13:08 1988
  1046. X--- xtroff/fontstuff/vf2bdf.c    Sat Nov 12 02:04:12 1988
  1047. X***************
  1048. X*** 127,133 ****
  1049. X          {
  1050. X              for (k = (pd->left + pd->right + 7) / 8; --k >= 0; )
  1051. X                  printf("%02x", *p++);
  1052. X!             printf(" \n");
  1053. X          }
  1054. X          printf("ENDCHAR\n");
  1055. X      }
  1056. X--- 127,133 ----
  1057. X          {
  1058. X              for (k = (pd->left + pd->right + 7) / 8; --k >= 0; )
  1059. X                  printf("%02x", *p++);
  1060. X!             printf("\n");
  1061. X          }
  1062. X          printf("ENDCHAR\n");
  1063. X      }
  1064. Xdiff -r -c /h/xwindows/X/contrib/clients/xtroff/xtroff.man xtroff/xtroff.manX
  1065. X*** /h/xwindows/X/contrib/clients/xtroff/xtroff.man    Thu Jul 14 18:59:28 1988
  1066. X--- xtroff/xtroff.manX    Sat Nov 12 03:03:22 1988
  1067. X***************
  1068. X*** 234,244 ****
  1069. X  "-xrm".
  1070. X  Some of the options are meaningless for \fIxtroff\fP. 
  1071. X  .SH "FILES"
  1072. X! .na
  1073. X! .ta \w'/usr/local/lib/xtroff/*   'u
  1074. X! /usr/local/lib/troff/*    - troff width tables
  1075. X! /usr/local/lib/xtroff/*    - bitmap fonts for xtroff
  1076. X! .ad
  1077. X  .SH "SEE ALSO"
  1078. X  .LP
  1079. X  .I Using and Specifiying X Resources
  1080. X--- 234,242 ----
  1081. X  "-xrm".
  1082. X  Some of the options are meaningless for \fIxtroff\fP. 
  1083. X  .SH "FILES"
  1084. X! WIDTHDIR/*    - troff width tables
  1085. X! .br
  1086. X! FONTDIR/*    - bitmap fonts for xtroff
  1087. X  .SH "SEE ALSO"
  1088. X  .LP
  1089. X  .I Using and Specifiying X Resources
  1090. XWhAt_A_mArOoN
  1091. Xecho 'Now run ximake in this directory, and XtStuff to generate the Makefiles'
  1092. Xecho 'And you are ready to go...'
  1093. Xexit
  1094. END_OF_update.sh
  1095. if test 27954 -ne `wc -c <update.sh`; then
  1096.     echo shar: \"update.sh\" unpacked with wrong size!
  1097. fi
  1098. chmod +x update.sh
  1099. # end of overwriting check
  1100. fi
  1101. if test -f ximakedo.sh -a "${1}" != "-c" ; then 
  1102.   echo shar: Will not over-write existing file \"ximakedo.sh\"
  1103. else
  1104. echo shar: Extracting \"ximakedo.sh\" \(871 characters\)
  1105. sed "s/^X//" >ximakedo.sh <<'END_OF_ximakedo.sh'
  1106. X#! /bin/sh
  1107. X# Edit this to change this to the top directory where your X11R3 source is
  1108. X# something like /usr/src/local/X.V11R3
  1109. XTOPDIR=please/change/this/to/the/real/X/top/level/directory
  1110. Xif test -d xtroff ; then
  1111. X    cd xtroff
  1112. Xfi
  1113. Xif test -f suntroff.c -a -f xtroff.manX ; then
  1114. X    true
  1115. Xelse
  1116. X    echo 'Please cd to contrib/clients/xtroff before running this script'
  1117. X    exit 1
  1118. Xfi
  1119. Xif test ! \( -d $TOPDIR -a -d $TOPDIR/util -a -d $TOPDIR/util/scripts \) ; then
  1120. X    echo 'Please fix TOPDIR and run this script again'
  1121. X    exit 1
  1122. Xelif test ! -x $TOPDIR/util/scripts/ximake.sh ; then
  1123. X    echo Something wrong - $TOPDIR/util/scripts/ximake.sh isn\'t executable
  1124. X    exit 1
  1125. Xelse
  1126. X    $TOPDIR/util/scripts/ximake.sh $TOPDIR
  1127. X    cd XtStuff
  1128. X    case $TOPDIR in
  1129. X        /*);;
  1130. X        *)TOPDIR=../$TOPDIR;;
  1131. X    esac
  1132. X    $TOPDIR/util/scripts/ximake.sh $TOPDIR
  1133. Xfi
  1134. Xecho Now run \'make depend\', \'make\', \'make xfonts\' and \'make install\'
  1135. END_OF_ximakedo.sh
  1136. if test 871 -ne `wc -c <ximakedo.sh`; then
  1137.     echo shar: \"ximakedo.sh\" unpacked with wrong size!
  1138. fi
  1139. chmod +x ximakedo.sh
  1140. # end of overwriting check
  1141. fi
  1142. echo shar: End of shell archive.
  1143. exit 0
  1144. -- 
  1145. Mike Wexler(wyse!mikew)    Phone: (408)433-1000 x1330
  1146. Moderator of comp.sources.x
  1147.